New text tool #4383

dacap · 2024-03-25T15:00:53Z

A work-in-progress to convert the "insert text" command into an interactive "text tool."

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-06-19T19:52:20Z

src/app/ui/editor/writing_text_state.cpp

+      doc::BlendMode::SRC);
+  }
+
+  void renderExtraCelText(bool withSelection) {


warning: parameter 'withSelection' is unused [misc-unused-parameters]

Suggested change

void renderExtraCelText(bool withSelection) {

void renderExtraCelText(bool /*withSelection*/) {

aseprite-bot · 2024-06-19T19:52:20Z

src/app/ui/editor/writing_text_state.cpp

+
+void WritingTextState::onEditorResize(Editor* editor)
+{
+  gfx::PointF scale(editor->projection().scaleX(),


warning: variable 'scale' of type 'gfx::PointF' (aka 'PointT') can be declared 'const' [misc-const-correctness]

Suggested change

gfx::PointF scale(editor->projection().scaleX(),

gfx::PointF const scale(editor->projection().scaleX(),

aseprite-bot · 2024-06-19T19:52:21Z

src/app/ui/editor/writing_text_state.cpp

+
+void WritingTextState::onEditorResize(Editor* editor)
+{
+  gfx::PointF scale(editor->projection().scaleX(),


warning: narrowing conversion from 'double' to 'float' [bugprone-narrowing-conversions]

gfx::PointF scale(editor->projection().scaleX(), ^

aseprite-bot · 2024-06-19T19:52:21Z

src/app/ui/editor/writing_text_state.cpp

+void WritingTextState::onEditorResize(Editor* editor)
+{
+  gfx::PointF scale(editor->projection().scaleX(),
+                    editor->projection().scaleY());


warning: narrowing conversion from 'double' to 'float' [bugprone-narrowing-conversions]

editor->projection().scaleY()); ^

aseprite-bot · 2024-06-19T19:52:21Z

src/ui/entry.cpp

@@ -235,6 +236,17 @@ gfx::Rect Entry::getEntryTextBounds() const
  return onGetEntryTextBounds();
 }

+gfx::Rect Entry::getCharBoxBounds(const int charBoxIndex)
+{
+  gfx::Rect bounds;


warning: variable 'bounds' of type 'gfx::Rect' (aka 'RectT') can be declared 'const' [misc-const-correctness]

Suggested change

gfx::Rect bounds;

gfx::Rect const bounds;

aseprite-bot · 2024-06-19T19:52:21Z

src/ui/entry.cpp

@@ -569,7 +581,8 @@
      indexBox = j+1;
    }

-    int x = bounds().x + border().left() + segmentWidth + m_boxes[indexBox].width / 2;
+    int x = bounds().x + border().left()


warning: variable 'x' of type 'int' can be declared 'const' [misc-const-correctness]

Suggested change

int x = bounds().x + border().left()

int const x = bounds().x + border().left()

aseprite-bot · 2024-06-19T19:52:21Z

src/ui/entry.cpp

@@ -569,7 +581,8 @@
      indexBox = j+1;
    }

-    int x = bounds().x + border().left() + segmentWidth + m_boxes[indexBox].width / 2;
+    int x = bounds().x + border().left()


warning: narrowing conversion from 'float' to 'int' [bugprone-narrowing-conversions]

int x = bounds().x + border().left() ^

aseprite-bot · 2024-06-19T19:52:21Z

src/ui/entry.cpp

@@ -569,7 +581,8 @@
      indexBox = j+1;
    }

-    int x = bounds().x + border().left() + segmentWidth + m_boxes[indexBox].width / 2;
+    int x = bounds().x + border().left()


warning: narrowing conversion from 'int' to 'float' [bugprone-narrowing-conversions]

int x = bounds().x + border().left() ^

aseprite-bot · 2024-06-19T19:52:21Z

src/ui/entry.cpp

@@ -569,7 +581,8 @@
      indexBox = j+1;
    }

-    int x = bounds().x + border().left() + segmentWidth + m_boxes[indexBox].width / 2;
+    int x = bounds().x + border().left()
+      + (segmentWidth + m_boxes[indexBox].width / 2) * m_scale.x;


warning: narrowing conversion from 'int' to 'float' [bugprone-narrowing-conversions]

+ (segmentWidth + m_boxes[indexBox].width / 2) * m_scale.x; ^

aseprite-bot · 2024-06-19T19:52:21Z

src/ui/entry.cpp

@@ -569,7 +581,8 @@
      indexBox = j+1;
    }

-    int x = bounds().x + border().left() + segmentWidth + m_boxes[indexBox].width / 2;
+    int x = bounds().x + border().left()
+      + (segmentWidth + m_boxes[indexBox].width / 2) * m_scale.x;


warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division]

+ (segmentWidth + m_boxes[indexBox].width / 2) * m_scale.x; ^

This new font selector list installed fonts with its proper name. It still needs some extra work to select font set styles (regular, bold, italic, etc.)

If we clicked bold/italic, and then chose another font family, we were using the cached typeface inside the FontInfo instead of an update typeface with the selected styles applied (bold/italic). Now we don't cache the typeface inside FontInfo to avoid this.

This fixes the required output image size to render text in different languages when the text doesn't support the full range of the specified chars/code points, and multiple fonts/text runs are used.

This is the first (not yet production-ready) version of the interactive Text tool. The text input is done with a transparent ui::Entry, and on each text modification an ExtraCel is rendered with this same ui::Entry's TextBlob to be displayed in the canvas with the active zoom level. The ui::Entry is being painted along the text in the canvas (just for testing), but this is something to be fixed. Probably it will not be the case in the future and a fully customized rendering (onPaint()) process will be required.

Now we don't render the default ui::Entry edges, but we paint just a border of the text bounds + the rendered text highlighting selected text on the canvas itself. With this change click mouse positions are translated with a scale factor that changes depending on the app::Editor zoom.

aseprite-bot

clang-tidy made some suggestions

aseprite-bot · 2024-06-19T20:10:39Z

src/app/ui/editor/writing_text_state.cpp

+
+void WritingTextState::onEditorResize(Editor* editor)
+{
+  const gfx::PointF scale(editor->projection().scaleX(),


warning: narrowing conversion from 'double' to 'float' [bugprone-narrowing-conversions]

const gfx::PointF scale(editor->projection().scaleX(), ^

aseprite-bot · 2024-06-19T20:10:39Z

src/app/ui/editor/writing_text_state.cpp

+void WritingTextState::onEditorResize(Editor* editor)
+{
+  const gfx::PointF scale(editor->projection().scaleX(),
+                          editor->projection().scaleY());


warning: narrowing conversion from 'double' to 'float' [bugprone-narrowing-conversions]

editor->projection().scaleY()); ^

aseprite-bot · 2024-06-19T20:10:40Z

src/ui/entry.cpp

@@ -569,7 +580,8 @@ int Entry::getCaretFromMouse(MouseMessage* mousemsg)
      indexBox = j+1;
    }

-    int x = bounds().x + border().left() + segmentWidth + m_boxes[indexBox].width / 2;
+    const int x = bounds().x + border().left()


warning: narrowing conversion from 'float' to 'int' [bugprone-narrowing-conversions]

const int x = bounds().x + border().left() ^

aseprite-bot · 2024-06-19T20:10:40Z

src/ui/entry.cpp

@@ -569,7 +580,8 @@ int Entry::getCaretFromMouse(MouseMessage* mousemsg)
      indexBox = j+1;
    }

-    int x = bounds().x + border().left() + segmentWidth + m_boxes[indexBox].width / 2;
+    const int x = bounds().x + border().left()


warning: narrowing conversion from 'int' to 'float' [bugprone-narrowing-conversions]

const int x = bounds().x + border().left() ^

This was linked to issues Mar 25, 2024

Textbox tool #28

Open

New font selector #4363

Open

This comment was marked as outdated.

Sign in to view

dacap force-pushed the new-text-tool branch from 14ceef2 to 047bebe Compare March 25, 2024 15:24

dacap self-assigned this Mar 25, 2024

dacap force-pushed the new-text-tool branch from 1668294 to 7c7a04e Compare April 9, 2024 20:10

This comment was marked as outdated.

Sign in to view

dacap force-pushed the new-text-tool branch from 33728fc to f27bace Compare April 16, 2024 14:34

dacap force-pushed the new-text-tool branch from 9a3f911 to c54e512 Compare April 23, 2024 18:43

dacap force-pushed the new-text-tool branch 2 times, most recently from 757f937 to 3456fc2 Compare May 7, 2024 23:20

dacap force-pushed the new-text-tool branch from 3456fc2 to 60d9a95 Compare June 12, 2024 01:37

This comment was marked as outdated.

Sign in to view

dacap force-pushed the new-text-tool branch 2 times, most recently from 6e06e9a to e7931fb Compare June 13, 2024 12:44

aseprite-bot reviewed Jun 19, 2024

View reviewed changes

dacap force-pushed the new-text-tool branch 2 times, most recently from 2890ebf to 5591a59 Compare June 19, 2024 20:03

dacap added 9 commits June 19, 2024 17:04

New ui::FocusMessage with oldFocus/newFocus fields

87b2a06

New font selector (fix aseprite#4363)

889c725

This new font selector list installed fonts with its proper name. It still needs some extra work to select font set styles (regular, bold, italic, etc.)

Use the most regular/normal typeface style for preview purposes

0bf1ef2

Add Bold/Italic buttons to select a font

da9f9b9

Fix text bounds using shaped text w/the font of each text run

2fa21c8

This fixes the required output image size to render text in different languages when the text doesn't support the full range of the specified chars/code points, and multiple fonts/text runs are used.

Fix FontInfo tests

a15e5aa

aseprite-bot reviewed Jun 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New text tool #4383

New text tool #4383

dacap commented Mar 25, 2024

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

aseprite-bot left a comment

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot left a comment

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

aseprite-bot Jun 19, 2024

	void renderExtraCelText(bool withSelection) {
	void renderExtraCelText(bool /withSelection/) {

	gfx::PointF scale(editor->projection().scaleX(),
	gfx::PointF const scale(editor->projection().scaleX(),

	int x = bounds().x + border().left()
	int const x = bounds().x + border().left()

New text tool #4383

Are you sure you want to change the base?

New text tool #4383

Conversation

dacap commented Mar 25, 2024

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aseprite-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment